From 45e8d3ede59e47c5e356c23531ae1eac8d376b11 Mon Sep 17 00:00:00 2001 From: robertl Date: Tue, 18 Jan 2005 19:13:01 +0000 Subject: [PATCH] gpx: when writing multi-mode, order of rte and trk was reversed. Regenerate various reference/igc* gpx files to validate. --- gpsbabel/gpx.c | 2 +- gpsbabel/reference/igc1.gpx | 42 ++++++++++---------- gpsbabel/reference/igc1_gpx.out | 48 +++++++++++------------ gpsbabel/reference/igc2_gpx.out | 68 ++++++++++++++++----------------- 4 files changed, 80 insertions(+), 80 deletions(-) diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c index 9f6c5a38b..41f9f1a2e 100644 --- a/gpsbabel/gpx.c +++ b/gpsbabel/gpx.c @@ -1268,8 +1268,8 @@ gpx_write(void) } waypt_disp_all(gpx_waypt_pr); - gpx_track_pr(); gpx_route_pr(); + gpx_track_pr(); fprintf(ofd, "\n"); } diff --git a/gpsbabel/reference/igc1.gpx b/gpsbabel/reference/igc1.gpx index 35191c176..63e3ef55d 100644 --- a/gpsbabel/reference/igc1.gpx +++ b/gpsbabel/reference/igc1.gpx @@ -1,30 +1,45 @@ - - - + + + PALLMG PALLMG PALLMG dot - + PILOT CHRIS JONES CHRIS JONES dot - + PLUMTH PLUMTHORPE LOC PLUMTHORPE LOC dot + + AB1 + + 0.000000 + BORAH + + + 0.000000 + BALDWI + + + 0.000000 + MANAIR + + @@ -531,19 +546,4 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/ - - AB1 - - 0.000000 - BORAH - - - 0.000000 - BALDWI - - - 0.000000 - MANAIR - - diff --git a/gpsbabel/reference/igc1_gpx.out b/gpsbabel/reference/igc1_gpx.out index 9dc64d888..c88087656 100644 --- a/gpsbabel/reference/igc1_gpx.out +++ b/gpsbabel/reference/igc1_gpx.out @@ -6,6 +6,30 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.topografix.com/GPX/1/0" xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd"> + + 0001 + IGCDATE000000: + + TAKEOFF + BORAH + + + START + BORAH + + + TURN01 + BALDWI + + + FINISH + MANAIR + + + LANDING + MANAIR + + GNSSALTTRK IGCHDRS~HFPLTPILOT:CHRIS JONES~ @@ -351,28 +375,4 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/ - - 0001 - IGCDATE000000: - - TAKEOFF - BORAH - - - START - BORAH - - - TURN01 - BALDWI - - - FINISH - MANAIR - - - LANDING - MANAIR - - diff --git a/gpsbabel/reference/igc2_gpx.out b/gpsbabel/reference/igc2_gpx.out index 6b2e34087..da688c349 100644 --- a/gpsbabel/reference/igc2_gpx.out +++ b/gpsbabel/reference/igc2_gpx.out @@ -6,6 +6,40 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.topografix.com/GPX/1/0" xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd"> + + 0001 + IGCDATE160701: 500KTri + + + TAKEOFF + LashamClubhouse + + + + START + LashamStart S Start + + + + TURN01 + Sarnesfield TP1 + + + + TURN02 + NormanCross TP2 + + + + FINISH + LashamStart S Finish + + + + LANDING + LashamClubhouse + + PRESALTTRK IGCHDRS~HFFXA035~HFPLTPILOT:Bill Bloggs~HFGTYGLIDERTYPE:Schleicher ASH-25~HFGIDGLIDERID:ABCD-1234~HFDTM100GPSDATUM:WGS-1984~HFRFWFIRMWAREVERSION:6.4~HFRHWHARDWAREVERSION:3.0~HFFTYFRTYPE:Manufacturer Model~HFGPSMarconiCanada:Superstar 12ch max10000m~HFPRSPRESSALTSENSOR:Sensyn XYZ1111 max11000m~HFCIDCOMPETITIONID:XYZ-78910~HFCCLCOMPETITIONCLASS:15mMotor Glider~HFSCMSECONDCREW:JohnSmith~ @@ -90,38 +124,4 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/ - - 0001 - IGCDATE160701: 500KTri - - - TAKEOFF - LashamClubhouse - - - - START - LashamStart S Start - - - - TURN01 - Sarnesfield TP1 - - - - TURN02 - NormanCross TP2 - - - - FINISH - LashamStart S Finish - - - - LANDING - LashamClubhouse - - -- 2.30.2